removed features out into plugin