feedback from msuchy during PR - more files to SCL