stubs improved

Signed-off-by: luka8088 <luka8088@owave.net>