Added types and models and delegates