Remove unnecesary imports
Improve JSON serializer field