Now uses a bimap for input names