Updated implementation

Signed-off-by: Lasse Bigum <l.bigum@samsung.com>