Added Exception and compatibility