Make cell rendering options more flexible