Decoupling from other parts of f3 apps almost done
Fixed error after refactoring