Added mask on direction option - filters out properties with non-matching direction
Added support for entities in subdirectory + improved masking/merging of Entity