Add AMD support, and all options in one property