User returnLastInsertedId instead of justInsert or justUpdate for be consistent with @Insert operation
Better management of reuse entity queries or generate a new one, allowing have entity queries with @CustomSqlQuery variations