Refactored location to be referenced instead of embedded and added better subject support