Add Morris and Raphael support