Adding support for rests