Added annotation package
Removed obsolete code and modified foreach of records
Obsolete classes
Added annotation support and fixed frame return