Use SingletonSerializer for Unit

closes #118