Modified module for better code re-use