Adds Keywords and modifies policies
Solves merge conflicts