Added Integration Test + Additional Field Extensions