Updated registration
updated registration and init