Changed namespace
Different improvements