Basic namespace idea implemented
Refactored extraction