[1.x-branch 1/1] Add more class methods for better use of metadata