Simplifying Entry and Event managers. Refs #101