small refactoring / removed deprecated annotations from services / added flags package to composer