Added basic overflow system with backwards compatibility