Better build rules