Added new groups and valid architectures armv7, armv7s