Improved reusability as an external package
.