Added apxs support