Update comments in Core Helpers