Added paper clip and edited user associations