Using latest MPS API for integration.. Closes #85 and #89