Entities overhauled, foxes added