preparing for better context handling for entities