Refactored to remove build errors