Added more register validation