Added functionality for most methods