Added proper list functionality