Changes made to handle the leaflists and container lists