small schemma changes and pagination