Implementing a future-proof solution