Patch: fix errors on resource add, add columns to Resource.java