Improve shader manager