Improve description and add rules