Refactor

Examples needs to be updated