Added namespace and extendable class