added sma fields, improved parser