Added minimal attachment parsing