Further additions to basic application skeleton