Updated user functions and gems