Decouple features

Last updated