* Making app more future-proof