Changed namespace. Updated deps