Started wrapping the dynamic api