Not currently, but database probably will have to start being an argument later. Figured it makes sense to include it for now since it will be useful later. I'll get rid of the other two.