Reorganized attr scope
Missing import
New support