Add depreciated compatibility methods and clean up exceptions