resolved relationships and added enum support