Added cross building support