Convert to ARC support
Fixed after converting
A lot of new features for better data source handling