Added more fields and refactoring
refactorying
Merge branch 'master' of github.com:dsspasov/ZOO