Added DB mapping