Future implementation enhancement