Revised the Types classes to include javadocs