Fixed some "false negative" issues and added support for AbstractAnnotatedEntity