added solus & onapp support