Updates based on current API implementation
Fixed machines call