Improve library and deck system