Add classes for future machines
Clean-up: Clean-up source and fix type Javadocs