Added todo to use Set