Adding supprt for no framework image use