Add ValueRepository
Work on attributes