A bit more refactoring to clearly separate frame from application
and to distinguish between the core and and server support