Fixed all Services, added all steps of initialisation od entity