Added some basic framework functionality.