Modify and add aditional definitions