Fixed logic for setting path for non-images, fixed _type not being set by making sure appropriate methods are not static