Refactored block implementation