Modified zoo class