Implemented and added appropritate Javadoc comments