Further decoupling, added date search