Added type aliases