Updating installer to be more intelligent.