switched to using type aliases for different entity ids