Moved change listener to _create