Some modification made to correspond with the java classes