Refactored code to make it more generic