removed explicit type declaration for includes, updated model and inferrer