added IDs to models, fixed constructors as well