Updated to use new doctrine annotations