Some modification to accomodate the new retrieval model