Added initial support for multiple types of output