Added functions, input keys and object names