Preparations for new implementations / todos