More work on inputs for facade model