Add Auto map for testing
Remove stale style api