Converted to use common doctrine interfaces