Adding some debug logging
Updating constant and property names