Changed property provider to be initialized by first instantiation, so available if used outside of the war. Also further changes to accomodate swyd api changes