Updated model functionality