Migrated from manual common spec