Added optional for related entity. This may need for the other annotation terms as well.