Changed public_interface