Continued work on attach handler