Improve system shares validation