Moved listing to a directive