Worked on improved plugins/services implementation
Improved error handling