Improve reusability