Change comments and added service structue