Improve cost models