Add changes for stage 4

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>