Add support for extension/restriction in simple content

Also address issue #6