Cleaned up function decorators to reduce number of WS calls