Added fabric and exceptions