Separate library and add console