Add feature to disable or enable registration
Update compile parameters