Added hibernate. Pending singleton templates