Improved API for future use