refactor billboard set, a more data driven way.