Updated spec to include library and classes