Added support for rests