Second attempt to fix the applications class