Use lenses for java pieces and get rid of custom Default class