Improve Atlas API a little