Code Fixes
Dictionary Fix
Added Animal Support