Unify the functions version and usage

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>