Removed lifecycle-mapping