Enhancement

Added preference and presistency