Added support for Boot and Recovery partitions