Some changes to make ServerSide annotation working on Class Level. 
Needs more testing