Continue rework...
Continue rework...
Continue rework...
Continue rework...
Ugly hack about scope inheritance.