New converter class, further annotations work