Turned CFS into a singleton