Application skeleton changes