Changed db schema, removed lookup for domains