Refactored image spec