Improves Date component