Added basic attachment fields;