Added basic support for two field display