Beef up the definitions, pull in the refs