Add fields, constructor and getter/setters

Also provided the Javadoc comments