Refactoring + Handle Mapping + new sample code