Adds basic for features
Fixes conflict