Changes in machine api
fix conflicts