Fixes to make it runnable, use ContextBuilder