Work on annotation support - implemented NamedQuery support