Feature/fees