more flexible API mapping

added include feature