Initial revision.
Added missing fields. Prepare for mobile support.