More work on installer