Improve options and atlas class (tested in artwork).