Add support for names again