Added custom images support