Add comments to justify signals and hardcore option