Future proof solution