Feature dependencies

Fix more model dependencies