[TO BE REBASED] converter improvements, now it supports re databases