Retype validation added
Base components builder named changed