Add TODO and rename SQL script