ARM and API improvements