improve list based modeling logic..