Added types from current working files