More awesomeness added to the framework.