Added all fields and getters and setters