Added TODO comment, for reducing code duplication in future