Changed namespace and some minor changes