fixed reflection
modularized code with the services classes