Use maps instead of proplists, correct lager levels