Feature/rbase database