Added options to control app behaviour