Added new Field attributes to Schema and fixed minor bugs