Add support for generic profile