#70 Image fields support