[UPDATE] Model architecture