Reusability improvements