Some changes in namespace