Support independent build