Changing references schema for future usage