JAVA-24 fixed presentation model imports and annotations