Improvements to reusability