Add more specs + optional active support support