Added var annotations for entity
Added/Corrected var annotations