Adding appropriate functions

Signed-off-by: Bondan Herumurti <bherumurti@gmail.com>