added parsing to models