Added type field and param