NEW: added new injections, removed app instance usage in classes