Added type to inputs/outputs model, improved formater