Cosmetic changes getting closer to the prerelease
Added support for devices clause