V0.1.5 - Updates for generic images