Updated with more capabilities + naming constraints
Fixed merge conflict