Client server fixes & Entity Validation