Changes for ignoring LineAmount during marshalling