Fixed unresolved conflicts
Added missing optional constructor arguments