Added proper singleton/manager pattern & service