Adds support for apigen
Changes minor imperfections