PN-6992: Adding in remaining edits to refactor into a proper bean counting mechanism