Add missed utils
Add working implementation