Updated Entity implementation to match shapeblaster-ios.