Added composer support for 3.1 and above