Added better support for atlases.