Added new forms annotations