Adding trace option for debugging purposes