Added functions and user options