#533 - Adding TODO for refactoring constructor