Code slightly refactored
Added: Namespace will no longer get shadowed by other files that tries to
extend this namespace
Added alias checking (can be a string ro function that returns string)