Use proper references