Updated to use explicit calls to proplists functions.