Update Atlas and related code