Added isActive column and changed uer to company id