Refactored block and simulation models