Refactored reference tools