Added Javadoc placeholders
Changed according to class changes
Fixed