Homunculus enhancements