Adding new applicability support