Added missing self-keywords