CoreService hax for now