@jcarres-mdsol is set to refactor this are with regards to a singleton anyway.