Add enterprise and other features