added entityreference, commented out contextual