Removed dependency on future