Adding GSON entity support