Added first code of entity annotation and fixed form