Fixed command registry creation
ContextUtils removed