Remove usage of Services , and pass the framework instance everywhere