Removed interface check, not needed if merged with core