Moved asyc assignments to the correct object