Add some more functionality to configure script