Remove proplists and use ListDict