Improved reusability