Added list and grid functions