Adding support for spacers

UCC git Repository :: git.ucc.asn.au