Refactoring on Cloud and PrivateMachine facades; storing records with errors, even if they timed out