Add check for the complete features