Refactored Machine related abstractions.