Add Audio and Option constructors