Removed option for async for now