Add support for dynamic segments