Merging auth & plugin features