Move functions
Some improvements for App
Change args to params