Switched to using facades

Signed-off-by: Sebastian Klaus <sebastian@klaus.com.au>