Added DB components