added basic support for time and extended the list switch