added doctrine annotations
fixed doctrine annotations errors