Adding support for single
v0.1.0