remove user class instead use simply a list
fix exports