Updates to Frame class and related