Maintain original functionality