fix: helper functions has been added for implement improvements.