Merged some duplicate classes