Added some files and edited SenderMapping because of a bug