Updated interface implementation