Fix Type model
Fix subscription creation