extending the unary case to normal form and xsd

Signed-off-by: greenTara <taraathan@gmail.com>