Added missing definitions to compset

But there are still mising ones