Easier extendability for later