Updated application setup stuff