Improved logging
Schema changes, keep type, use session and properties