Feature/refactor app hacks