Adding in composite properties loader