Cleaned up loader and connection