Changed over some method return types