Fixed issues and added pagination and timing metadata