Dynamically set entities for annotations

Still need to dynamically set relationship type (and corresponding properties), but that has to wait for the associated webservice