custom application context moved to it's own file and renamed