More models from data
Extended algorithms and updated database population script