Removing need for extra attachments lookup on first load