Refactor to use new Atlas