Spare parts for future dev