References improvements