refactored logical models