Improve attribute proxy for entity