A few more changes and keywords