Added block core and refactored interface locator