Added annotations for better service control