Fixes more entity mapping stringify issues and adds Ciconia back into the system.