Removed latto references, moved mixins and added tables