Completed the input part for the new types