Updated with username signature