Added serializable_fields option