Added option for listing only