Move registry assignment to attributes