Better types
Better types