More work on user plugin