updates to the framework

Signed-off-by: Marcin Wiatr <marcin@qi-interactive.com>