Fara

Order and DB handler merging