Make it fix target to separate attribute and listen on change-state too