in the api, change the query execute methods to list and the change the methods that return one object to uniqueResult. that way those api methods are consequent with the well known hibernate query api.