Updated internal stuff