More work

Change-Id: Ifacb713ceb7ea56de83e2f05b2e7c8e3624ca68c
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>