Completed More work on Atlas API