Added date/time support and fixed String encoding.