Added support for serving images