Add features that were missing in controllers