Added new framework classes