Updated registration and options