v0.0.4 => Refactored code