Now uses a separate listener per each property dependant on.