Added Field.cs and other changes