Added back some method impl's to CanaryEntity ...