Changed component lookups to be a bit nicer.