Deprecated more methods and added error checking around allocations