Add error handling
Add full VPSImage support