Better assignment date storage
Minor changes