Improved base model set listeners