Improve associations code quality