Some changes for more asynchronous methods, not completely finished yet