Refactoring -- Added Maybe types