Improved COST 231-WI Model for Irregular Built-Up Areas