Edited class properties & added mappedBy properties