added factory, updated DBs