update TODO
added sql-mapping fetcher functions