Added enumeration support
Format datetime nicely