Changed DB interface and composer