Added constructors and changed some field types

to int