Minor refactoring. Seperated expose from zimple core