Modified library to implement commands