Switch to including Usage only, instead of exluding some cost types

Switch to including Usage only, instead of exluding some cost types #43