Add better logging options
More logging clean-up
Add List and Object property support