Fork namespace
Implement some custom features