Fixed and added field from sender and fixed db