Changed model generation approach and use to make your life easier :)