Removed wrapper for state functions