Refactor for code reuse
Update version 1.0.3-SNAPSHOT