Minor updates and new classes added.