The last commit for this branch of development. The rest would be done using iPOJO dependency injection framework instead of manual service injecting.