Improvements from parent project (work in progress)