Change to a class to allow multiple instances
Speed up retrieval