Made the app more generic