Added tags and pagination support.