Adding support for other types of installs :S