Changed the return types of all public interfaces