Tukaiz develop

Do we also need a :site_id field?