Started rewriting all block&items to use implementation from core.