Add db-spec macro
Change API to use db-spec, no macros