Updated TODO and added a updated_at timestamp