Added collection schema and fixed stop button