Moved block processing into model