#1 JPA support draft