Conference changes plus Change base namespace