Added functionality for some things