Changed userId to a long