Add db_session support