Add bin and external support