Improved logging and added licence terms
Commented properties to fix UT