FIX Use strings for type keys