Merged PR from Tomas Jansson to include dynamic instead of logevent and better support for properties