added support in input functions