Fix logic model - move data from properties to methods