Add generic reportstore - In progress