Added 'support' for namespace + one bugfix