Additional Creature functionality
Merge origin/master