Added/moved some references