Improve abstract machine