Added strict mode and started adding registration