Updated Countryman build rules