Updated frame class