Added logging information and updated javadoc