Add support for abstract and simplesect