Renamed interface + exception handling