Refactor to use data tags