Improved general functionality