Implemented methods and added Javadoc comments